Skip to content

Update rust-lightning to use default_value_vec#850

Merged
tnull merged 2 commits intolightningdevkit:mainfrom
carlaKC:macro-update
Apr 29, 2026
Merged

Update rust-lightning to use default_value_vec#850
tnull merged 2 commits intolightningdevkit:mainfrom
carlaKC:macro-update

Conversation

@carlaKC
Copy link
Copy Markdown
Contributor

@carlaKC carlaKC commented Mar 26, 2026

Depends on #4507

@ldk-reviews-bot
Copy link
Copy Markdown

ldk-reviews-bot commented Mar 26, 2026

I've assigned @valentinewallace as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

Comment thread src/event.rs
// not support JIT channels in combination with trampoline. We're not at risk of
// double-reporting a skimmed fee when we have multiple next_htlcs because we
// expect our skimmed fee to be zero.
if skimmed_fee_msat.is_some() {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems good enough for now, but will consider further changes to PaymentForwarded in LDK to possibly make this mapping a bit cleaner.

@tnull
Copy link
Copy Markdown
Collaborator

tnull commented Apr 8, 2026

I think this should be unblocked now, please rebase! (cc @carlaKC)

@carlaKC
Copy link
Copy Markdown
Contributor Author

carlaKC commented Apr 8, 2026

Rebased, but build is going to fail - there are some changes from lightningdevkit/rust-lightning#4266 which need to go in before we can bump to use the macro.

@tnull tnull added this to the 0.8 milestone Apr 20, 2026
@tnull
Copy link
Copy Markdown
Collaborator

tnull commented Apr 29, 2026

Alright, we just bumped to 044f3fab42e3085edecd40f0c9b369093edb7133, so the upstream changes you need should be available now!

@carlaKC
Copy link
Copy Markdown
Contributor Author

carlaKC commented Apr 29, 2026

Rebased w/ no conflicts except Cargo.toml change.

Copy link
Copy Markdown
Collaborator

@tnull tnull left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to undraft, but I think we don't need to touch the dependencies at all now?

Comment thread Cargo.toml Outdated
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "044f3fab42e3085edecd40f0c9b369093edb7133", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "044f3fab42e3085edecd40f0c9b369093edb7133" }
lightning-dns-resolver = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "044f3fab42e3085edecd40f0c9b369093edb7133" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "4f5e64aa87004d6f2b214cd95a779e07a7e24f5a", features = ["std"] }
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is no reason we need to bump again from 044f3fab42e3085edecd40f0c9b369093edb7133, right?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

044f3fab42e3085edecd40f0c9b369093edb7133 doesn't contain default_value_vec because it came before the macro addition?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest merge has a dep bump that includes the changes we need though!

Rebased on that, so now we indeed don't need a change to dependencies - diff.

carlaKC added 2 commits April 29, 2026 14:03
Note that we still don't expect to receive multiple outgoing HTLCs
because trampoline has not yet been enabled, but we lay the groundwork
here.
@carlaKC carlaKC marked this pull request as ready for review April 29, 2026 18:05
@tnull tnull merged commit b24a905 into lightningdevkit:main Apr 29, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants